From 01d546796c96ef629a81187b36c0edbfa92083cb Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 3 Mar 2006 10:58:42 +0100 Subject: [PATCH] It's not necessary to define a function for dumping virtual IOAPIC table entry, that makes the code hard to comply with condition compiling of HVM_DBG_LOG. Signed-off-by: Xin Li --- xen/arch/x86/hvm/vioapic.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 33c1ed1fdf..f3bde8d9ba 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -52,20 +52,6 @@ static void ioapic_enable(hvm_vioapic_t *s, uint8_t enable) s->flags &= ~IOAPIC_ENABLE_FLAG; } -static void ioapic_dump_redir(hvm_vioapic_t *s, uint8_t entry) -{ - RedirStatus redir = s->redirtbl[entry]; - - printk("ioapic_dump_redir entry %x vector %x " - "deliver_mod %x destmode %x delivestatus %x " - "polarity %x remote_irr %x trigmod %x mask %x dest_id %x\n", - entry, redir.RedirForm.vector, redir.RedirForm.deliver_mode, - redir.RedirForm.destmode, redir.RedirForm.delivestatus, - redir.RedirForm.polarity, redir.RedirForm.remoteirr, - redir.RedirForm.trigmod, redir.RedirForm.mask, - redir.RedirForm.dest_id); -} - #ifdef HVM_DOMAIN_SAVE_RESTORE void ioapic_save(QEMUFile* f, void* opaque) { @@ -534,7 +520,19 @@ void hvm_vioapic_set_irq(struct domain *d, int irq, int level) if (!IOAPICEnabled(s) || s->redirtbl[irq].RedirForm.mask) return; - ioapic_dump_redir(s, irq); + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "hvm_vioapic_set_irq entry %x " + "vector %x deliver_mod %x destmode %x delivestatus %x " + "polarity %x remote_irr %x trigmod %x mask %x dest_id %x\n", + irq, + s->redirtbl[irq].RedirForm.vector, + s->redirtbl[irq].RedirForm.deliver_mode, + s->redirtbl[irq].RedirForm.destmode, + s->redirtbl[irq].RedirForm.delivestatus, + s->redirtbl[irq].RedirForm.polarity, + s->redirtbl[irq].RedirForm.remoteirr, + s->redirtbl[irq].RedirForm.trigmod, + s->redirtbl[irq].RedirForm.mask, + s->redirtbl[irq].RedirForm.dest_id); if (irq >= 0 && irq < IOAPIC_NUM_PINS) { uint32_t bit = 1 << irq; -- 2.30.2